From 1a14c5645d62098bcc6fd950158b5e4d88a8a2cc Mon Sep 17 00:00:00 2001 From: robertlipe Date: Thu, 1 Aug 2013 00:29:55 +0000 Subject: [PATCH] Trailing whitespace cleanup. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4492 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/arcdist.cc | 8 ++-- gpsbabel/avltree.cc | 2 +- gpsbabel/defs.h | 46 ++++++++++----------- gpsbabel/destinator.cc | 2 +- gpsbabel/garmin_fit.cc | 2 +- gpsbabel/garmin_txt.cc | 2 +- gpsbabel/gdb.cc | 2 +- gpsbabel/geo.cc | 18 ++++----- gpsbabel/googledir.cc | 2 +- gpsbabel/gpx.cc | 8 ++-- gpsbabel/gtrnctr.cc | 4 +- gpsbabel/internal_styles.cc | 80 ++++++++++++++++++------------------- gpsbabel/kml.cc | 20 +++++----- gpsbabel/maggeo.cc | 2 +- gpsbabel/mapsend.cc | 2 +- gpsbabel/psitrex.cc | 6 +-- gpsbabel/reverse_route.cc | 4 +- gpsbabel/shortname.cc | 4 +- gpsbabel/tmpro.cc | 2 +- gpsbabel/trackfilter.cc | 2 +- gpsbabel/util.cc | 4 +- gpsbabel/vecs.cc | 2 +- gpsbabel/waypt.cc | 2 +- gpsbabel/xmlgeneric.h | 4 +- 24 files changed, 115 insertions(+), 115 deletions(-) diff --git a/gpsbabel/arcdist.cc b/gpsbabel/arcdist.cc index bfb4cea00..8456a91bb 100644 --- a/gpsbabel/arcdist.cc +++ b/gpsbabel/arcdist.cc @@ -236,17 +236,17 @@ arcdist_process(void) if (ptsopt) { wp->SetCreationTime(ed->arcpt2->GetCreationTime());; } else { - // Apply the multiplier to the difference between the times - // of the two points. Add that to the first for the + // Apply the multiplier to the difference between the times + // of the two points. Add that to the first for the // interpolated time. - int scaled_time = ed->frac * + int scaled_time = ed->frac * ed->arcpt1->GetCreationTime().msecsTo(ed->arcpt2->GetCreationTime()); QDateTime new_time(ed->arcpt1->GetCreationTime().addMSecs(scaled_time)); wp->SetCreationTime(new_time); } } if (global_opts.debug_level >= 1) { - warning("Including waypoint %s at dist:%f lat:%f lon:%f\n", + warning("Including waypoint %s at dist:%f lat:%f lon:%f\n", wp->shortname, ed->distance, wp->latitude, wp->longitude); } } diff --git a/gpsbabel/avltree.cc b/gpsbabel/avltree.cc index ea8bda08f..1f5400000 100644 --- a/gpsbabel/avltree.cc +++ b/gpsbabel/avltree.cc @@ -200,7 +200,7 @@ avltree_find(const avltree_t* tree, const QString& key, const void** data) int r = avltree_find(tree, t, data); xfree(t); return r; - + } diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 0cd81acf2..b06760428 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -361,7 +361,7 @@ fs_xml* fs_xml_alloc(long type); * Structures and functions for multiple URLs per waypoint. */ class url_link { - public: + public: url_link() : url_next(NULL) {} ; @@ -385,7 +385,7 @@ class wp_flags { speed(0), depth(0), is_split(0), - new_trkseg(0) {} + new_trkseg(0) {} unsigned int shortname_is_synthetic:1; unsigned int cet_converted:1; /* strings are converted to UTF8; interesting only for input */ unsigned int fmt_use:1; /* lightweight "extra data" */ @@ -448,25 +448,25 @@ public: depth(0), proximity(0), shortname(NULL), - description(NULL), - notes(NULL), - url_next(NULL), - route_priority(0), - hdop(0), - vdop(0), - pdop(0), - course(0), - speed(0), - fix(fix_unknown), - sat(-1), - heartrate(0), - cadence(0), - power(0), - temperature(0), - odometer_distance(0), - gc_data(NULL), - fs(NULL), - session(NULL), + description(NULL), + notes(NULL), + url_next(NULL), + route_priority(0), + hdop(0), + vdop(0), + pdop(0), + course(0), + speed(0), + fix(fix_unknown), + sat(-1), + heartrate(0), + cadence(0), + power(0), + temperature(0), + odometer_distance(0), + gc_data(NULL), + fs(NULL), + session(NULL), extra_data(NULL) { } public: QString CreationTimeXML() const; @@ -531,9 +531,9 @@ public: gpsbabel::DateTime GetCreationTime() const { return creation_time; } - void SetCreationTime(gpsbabel::DateTime t) { creation_time = t; + void SetCreationTime(gpsbabel::DateTime t) { creation_time = t; } - void SetCreationTime(time_t t) { creation_time = QDateTime::fromTime_t(t); + void SetCreationTime(time_t t) { creation_time = QDateTime::fromTime_t(t); } void SetCreationTime(time_t t, int ms) { creation_time.setTime_t(t); diff --git a/gpsbabel/destinator.cc b/gpsbabel/destinator.cc index d48c2b792..8d7f43a02 100644 --- a/gpsbabel/destinator.cc +++ b/gpsbabel/destinator.cc @@ -443,7 +443,7 @@ destinator_trkpt_disp(const waypoint* wpt) tm.tm_year -= 100; date = ((int)tm.tm_mday * 10000) + ((int)tm.tm_mon * 100) + tm.tm_year; gbfputint32(date, fout); - milliseconds = ((int)tm.tm_hour * 10000) + + milliseconds = ((int)tm.tm_hour * 10000) + ((int)tm.tm_min * 100) + tm.tm_sec; milliseconds = (milliseconds * 1000) + (wpt->GetCreationTime().time().msec()); diff --git a/gpsbabel/garmin_fit.cc b/gpsbabel/garmin_fit.cc index eeb040eee..1ee872f0a 100644 --- a/gpsbabel/garmin_fit.cc +++ b/gpsbabel/garmin_fit.cc @@ -113,7 +113,7 @@ fit_parse_header(void) debug_print(1,"%s: profile version=%d\n", MYNAME, ver); debug_print(1,"%s: fit_data.len=%d\n", MYNAME, fit_data.len); } - + if (len > 12) { // Unused according to Ingo Arndt gbfgetuint16(fin); diff --git a/gpsbabel/garmin_txt.cc b/gpsbabel/garmin_txt.cc index 3a959a197..efd6b894b 100644 --- a/gpsbabel/garmin_txt.cc +++ b/gpsbabel/garmin_txt.cc @@ -1307,7 +1307,7 @@ parse_track_waypoint(void) break; case 2: { time_t ct; - parse_date_and_time(str, &ct); + parse_date_and_time(str, &ct); wpt->creation_time = ct; } break; diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc index a7047ef26..419e0e9ab 100644 --- a/gpsbabel/gdb.cc +++ b/gpsbabel/gdb.cc @@ -1231,7 +1231,7 @@ write_header(void) memset(&tm, 0, sizeof(tm)); n = sscanf(gdb_release_date+7, "%d-%d-%d %d:%d:%d", &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec); - if (n != 6) { + if (n != 6) { // The $Date string in gdb_release_date[] above is bad. fatal(MYNAME ": internal date format error on %s\n", gdb_release_date + 7); } diff --git a/gpsbabel/geo.cc b/gpsbabel/geo.cc index a9c2bdbde..6a8992298 100644 --- a/gpsbabel/geo.cc +++ b/gpsbabel/geo.cc @@ -46,24 +46,24 @@ QString geo_read_fname; geocache_container wpt_container(const QString&); -// Compensate for most of class waypt still using C strings and needing +// Compensate for most of class waypt still using C strings and needing // copies anyway. -char * ShimString(const QString& s) +char * ShimString(const QString& s) { return xstrdup(s.toUtf8().data()); } -char * ShimString(const QStringRef& s) +char * ShimString(const QStringRef& s) { return xstrdup(s.toString().toUtf8().data()); } -double ShimAttributeDouble(const QXmlStreamAttributes& a, const QString& v) +double ShimAttributeDouble(const QXmlStreamAttributes& a, const QString& v) { QString rv = a.value(v).toString(); return rv.toDouble(); } -void GeoReadLoc() +void GeoReadLoc() { waypoint* wpt = NULL; while (reader.tokenType() != QXmlStreamReader::EndDocument) { @@ -165,7 +165,7 @@ geocache_container wpt_container(const QString& args) static void geo_rd_deinit(void) { - + } static void @@ -215,9 +215,9 @@ geo_waypt_pr(const waypoint* waypointp) } if (waypointp->gc_data && waypointp->gc_data->diff) { - writer.writeTextElement("difficulty", + writer.writeTextElement("difficulty", QString::number(waypointp->gc_data->diff/10)); - writer.writeTextElement("terrain", + writer.writeTextElement("terrain", QString::number(waypointp->gc_data->terr/10)); int v = 1; @@ -247,7 +247,7 @@ geo_waypt_pr(const waypoint* waypointp) v = 1; break; } - writer.writeTextElement("container", + writer.writeTextElement("container", QString::number(v)); } diff --git a/gpsbabel/googledir.cc b/gpsbabel/googledir.cc index e4539491f..6268294b8 100644 --- a/gpsbabel/googledir.cc +++ b/gpsbabel/googledir.cc @@ -20,7 +20,7 @@ /* * Parse the output of the following command: * curl "http://maps.googleapis.com/maps/api/directions/xml?origin='Albi,%20france'&destination='toulouse,%20france'&sensor=false" > google-direction.xml - * + * * For more information, check: * https://developers.google.com/maps/documentation/directions/ */ diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc index 6465542e0..8eb6cf01c 100644 --- a/gpsbabel/gpx.cc +++ b/gpsbabel/gpx.cc @@ -843,7 +843,7 @@ gs_get_container(geocache_container t) } gpsbabel::DateTime -xml_parse_time(const char* cdatastr) +xml_parse_time(const char* cdatastr) { int off_hr = 0; int off_min = 0; @@ -1343,11 +1343,11 @@ gpx_wr_init(const char* fname) // QFile requires binary mode on Windows. ofd = gbfopen(fname, "wb", MYNAME); oqfile.open(ofd->handle.std, QIODevice::WriteOnly); - + // This is ia bit of a lie. QXMLStreamWriter will pass everything // through the QTextCodec on the way out and that defaults to UTF-8. // Since we have so many C Strings in out output right now and those - // are already UTF-8 encoded via CET, if we don't outsmart that, we + // are already UTF-8 encoded via CET, if we don't outsmart that, we // get double encoding. writer.setCodec("ISO 8859-1"); @@ -1440,7 +1440,7 @@ fprint_xml_chain(xml_tag* tag, const waypoint* wpt) } if (wpt && wpt->gc_data->exported.isValid() && strcmp(tag->tagname, "groundspeak:cache") == 0) { - writer.writeTextElement("time", + writer.writeTextElement("time", wpt->gc_data->exported.toPrettyString()); } writer.writeEndElement(); diff --git a/gpsbabel/gtrnctr.cc b/gpsbabel/gtrnctr.cc index de925cc5e..62b16d0e1 100644 --- a/gpsbabel/gtrnctr.cc +++ b/gpsbabel/gtrnctr.cc @@ -391,9 +391,9 @@ gtc_act_hdr(const route_head* rte) gtc_new_study_lap(rte); route_disp(rte, gtc_study_lap); if (gtc_least_time) { - gtc_write_xml(0, "%s\n", + gtc_write_xml(0, "%s\n", gtc_least_time.toPrettyString().toUtf8().data()); - gtc_write_xml(1, "\n", + gtc_write_xml(1, "\n", gtc_least_time.toPrettyString().toUtf8().data()); } else { gtc_write_xml(1, "\n"); diff --git a/gpsbabel/internal_styles.cc b/gpsbabel/internal_styles.cc index ebb333a50..5b9280f5c 100644 --- a/gpsbabel/internal_styles.cc +++ b/gpsbabel/internal_styles.cc @@ -3,7 +3,7 @@ #include "defs.h" #if CSVFMTS_ENABLED -static char arc[] = +static char arc[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: GPSBabel arc filter format\n" @@ -29,7 +29,7 @@ static char arc[] = "OFIELD LAT_DECIMAL, \"\", \"%08.5f\"\n" "OFIELD LON_DECIMAL, \"\", \"%08.5f\"\n" ; -static char cambridge[] = +static char cambridge[] = "DESCRIPTION Cambridge/Winpilot glider software\n" "SHORTLEN 8\n" "EXTENSION dat\n" @@ -49,7 +49,7 @@ static char cambridge[] = "IFIELD SHORTNAME,\"\",\"%s\"\n" "IFIELD DESCRIPTION,\"\",\"%s\"\n" ; -static char csv[] = +static char csv[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: DeLorme SA 9.0 CSV\n" @@ -78,7 +78,7 @@ static char csv[] = "OFIELD LON_DECIMAL, \"\", \"%08.5f\"\n" "OFIELD DESCRIPTION, \"\", \"%s\"\n" ; -static char cup[] = +static char cup[] = "#\n" "# (c) 2006, Robert Lipe, based on sample files by Krzysztof Wojtas\n" "# Reference info: http://www.seeyou.ws/thankyou.php?fname=cup_format.pdf\n" @@ -124,7 +124,7 @@ static char cup[] = ; -static char custom[] = +static char custom[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Custom \"Everything\" Style\n" @@ -178,7 +178,7 @@ static char custom[] = "EPILOGUE Epilogue Line 1\n" "EPILOGUE Epilogue Line 2\n" ; -static char dna[] = +static char dna[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: DNA Marker Format\n" @@ -208,7 +208,7 @@ static char dna[] = "IFIELD DESCRIPTION, \"\", \"%s\"\n" ; -static char flysight[] = +static char flysight[] = "# Format: FlySight\n" "# Author: LukeH\n" "# Date: 10/10/10\n" @@ -238,7 +238,7 @@ static char flysight[] = "IFIELD GPS_FIX, \"\", \"%s\" # GPS fix type\n" "IFIELD GPS_SAT, \"\", \"%d\" # Number of satellites used in fix\n" ; -static char fugawi[] = +static char fugawi[] = "# fugawi XCSV style file\n" "#\n" "# Format: Fugawi\n" @@ -281,7 +281,7 @@ static char fugawi[] = "IFIELD GMT_TIME, \"\", \"%Y%m%d\"\n" "IFIELD HMSG_TIME, \"\", \"%02d%02d%02d\"\n" ; -static char garmin301[] = +static char garmin301[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Garmin 301 Position + Heartrate data\n" @@ -317,7 +317,7 @@ static char garmin301[] = "#EPILOGUE Epilogue Line 1\n" "#EPILOGUE Epilogue Line 2\n" ; -static char garmin_poi[] = +static char garmin_poi[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Garmin POI\n" @@ -353,7 +353,7 @@ static char garmin_poi[] = "OFIELD GEOCACHE_TERR, \"\", \"/%3.1f)\", \"no_delim_before,optional\"\n" "OFIELD DESCRIPTION, \"\", \"%-.50s\"\n" ; -static char geonet[] = +static char geonet[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: GEOnet Names Server (GNS) (http://earth-info.nga.mil/gns/html/cntry_files.html)\n" @@ -404,7 +404,7 @@ static char geonet[] = "IFIELD IGNORE, \"\", \"%s\" # FULL_NAME_ND\n" "IFIELD IGNORE, \"\", \"%s\" # MOD_DATE\n" ; -static char gpsdrive[] = +static char gpsdrive[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: GPSDrive\n" @@ -438,7 +438,7 @@ static char gpsdrive[] = "OFIELD LON_DECIMAL, \"\", \"%08.5f\"\n" "OFIELD ICON_DESCR, \"\", \"%s\"\n" ; -static char gpsdrivetrack[] = +static char gpsdrivetrack[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: GPSDriveTrack\n" @@ -470,7 +470,7 @@ static char gpsdrivetrack[] = "# IFIELD GMT_TIME, \"\", \"%a %b %d %H:%M:%S %Y\"\n" "IFIELD LOCAL_TIME, \"\", \"%a %b %d %H:%M:%S %Y\"\n" ; -static char gpsman[] = +static char gpsman[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: GPSMAN Format\n" @@ -506,7 +506,7 @@ static char gpsman[] = "# gpsman.c likes mkshort len = 8, whitespace = 0.\n" ; -static char iblue747[] = +static char iblue747[] = "# GPSBabel XCSV Style File http://www.gpsbabel.org/htmldoc-development/Styles.html\n" "# Author: Christian Barmala http://www.barmala.de/\n" "# License GNU Public License http://opensource.org/licenses/gpl-license.php\n" @@ -550,7 +550,7 @@ static char iblue747[] = "IFIELD IGNORE,\"\",\"%s\" # SAT INFO\n" "IFIELD PATH_DISTANCE_KM,\"\",\"%f\" # DISTANCE\n" ; -static char iblue757[] = +static char iblue757[] = "# GPSBabel XCSV Style File http://www.gpsbabel.org/htmldoc-development/Styles.html\n" "# Author: iBlue747csv by Christian Barmala http://www.barmala.de/\n" "# edited by Anthony Vella to suit the iBlue757 csv format (date format changed)\n" @@ -595,7 +595,7 @@ static char iblue757[] = "IFIELD IGNORE,\"\",\"%s\" # SAT INFO\n" "IFIELD PATH_DISTANCE_KM,\"\",\"%f\" # DISTANCE\n" ; -static char igo2008_poi[] = +static char igo2008_poi[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: iGO2008 points of interest\n" @@ -630,7 +630,7 @@ static char igo2008_poi[] = "IFIELD NOTES, \"\", \"%s\"\n" "IFIELD PHONE_NR, \"\", \"%s\"\n" ; -static char kompass_tk[] = +static char kompass_tk[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Kompass / Deutscher Alpenverein (DAV) Waypoints\n" @@ -650,7 +650,7 @@ static char kompass_tk[] = "IFIELD LAT_DECIMAL, \"\", \"%.7f\"\n" "IFIELD LON_DECIMAL, \"\", \"%.7f\"\n" ; -static char kompass_wp[] = +static char kompass_wp[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Kompass / Deutscher Alpenverein (DAV) Waypoints\n" @@ -678,7 +678,7 @@ static char kompass_wp[] = "IFIELD CONSTANT, \"1\", \"%s\" # unknown\n" "IFIELD DESCRIPTION, \"\", \"%s\"\n" ; -static char ktf2[] = +static char ktf2[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Kartex KTF 2.0 Degrees with decimals\n" @@ -716,7 +716,7 @@ static char ktf2[] = "IFIELD IGNORE, \"\", \"%s\" #Empty field\n" "IFIELD CONSTANT, \"$\", \"%s\"\n" ; -static char kwf2[] = +static char kwf2[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Kartex KWF 2.0 Degrees with decimals\n" @@ -756,7 +756,7 @@ static char kwf2[] = "IFIELD DESCRIPTION, \"\", \"%s\"\n" "IFIELD CONSTANT, \"$\", \"%s\"\n" ; -static char land_air_sea[] = +static char land_air_sea[] = "# Format: GPS Tracking Key Pro text file\n" "# Author: Tyler Ritchie\n" "# Date: 2011.02.04\n" @@ -782,7 +782,7 @@ static char land_air_sea[] = "IFIELD IGNORE,\"\",\"%s\" #This is the bearing data\n" "IFIELD ALT_FEET,\"\",\"%dft\"\n" ; -static char mainnav[] = +static char mainnav[] = "#\n" "# Support for MainNav CSV format\n" "#\n" @@ -835,7 +835,7 @@ static char mainnav[] = "IFIELD IGNORE, \"\", \"%s\" # JOURNEY_INDEX?\n" "IFIELD IGNORE, \"\", \"%s\" # ?\n" ; -static char mapconverter[] = +static char mapconverter[] = "# Format: Mapopolis.com Mapconverter\n" "# Author: Gary Paulson\n" "# Date: 01/13/2003\n" @@ -872,7 +872,7 @@ static char mapconverter[] = "IFIELD LON_DECIMAL, \"\", \"%08.5f\" # Longitude\n" "IFIELD LAT_DECIMAL, \"\", \"%08.5f\" # Latitude\n" ; -static char motoactv[] = +static char motoactv[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: MOTOACTV CSV\n" @@ -914,7 +914,7 @@ static char motoactv[] = "IFIELD PATH_COURSE,\"\",\"%.1f\"\n" "IFIELD IGNORE,\"\",\"%s\" # step rate\n" ; -static char mxf[] = +static char mxf[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Ozi Explorer\n" @@ -955,7 +955,7 @@ static char mxf[] = "OFIELD CONSTANT, \"ff0000\", \"%s\" # COLOR\n" "OFIELD CONSTANT, \"47\", \"%s\" # ICON\n" ; -static char navigonwpt[] = +static char navigonwpt[] = "# gpsbabel XCSV style file\n" "# Author: Tom Glaab\n" "#\n" @@ -997,7 +997,7 @@ static char navigonwpt[] = "OFIELD CONSTANT, \"%s\",\"\"\n" "OFIELD CONSTANT, \"%s\",\"49\"\n" ; -static char nima[] = +static char nima[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: NIMA/GNIS Geographic Names File\n" @@ -1044,7 +1044,7 @@ static char nima[] = "IFIELD DESCRIPTION, \"\", \"%s\" # FULL_NAME_ND\n" "IFIELD IGNORE, \"\", \"%s\" # MODIFY_DATE\n" ; -static char openoffice[] = +static char openoffice[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Tab delimited useful for OpenOffice, Ploticus etc.\n" @@ -1093,7 +1093,7 @@ static char openoffice[] = "IFIELD GPS_SAT, \"\", \"%d\"\n" "IFIELD GPS_FIX, \"\", \"%s\"\n" ; -static char ricoh[] = +static char ricoh[] = "DESCRIPTION Ricoh GPS Log File\n" "EXTENSION log\n" "DATATYPE TRACK\n" @@ -1108,7 +1108,7 @@ static char ricoh[] = "IFIELD GMT_TIME,\"\",\"%d-%m-%Y %H:%M:%S\"\n" ; -static char s_and_t[] = +static char s_and_t[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: MS S&T 2002/2003\n" @@ -1151,7 +1151,7 @@ static char s_and_t[] = "IFIELD GEOCACHE_DIFF, \"\", \"%3.1f\" # Geocache Type\n" "IFIELD GEOCACHE_TERR, \"\", \"%3.1f\" # Geocache Type\n" ; -static char saplus[] = +static char saplus[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: \n" @@ -1181,7 +1181,7 @@ static char saplus[] = "IFIELD IGNORE, \"\", \"\" # Holder for Geocache Type\n" ; -static char sportsim[] = +static char sportsim[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Sportsim track files\n" @@ -1216,7 +1216,7 @@ static char sportsim[] = "IFIELD TIMET_TIME, \"\", \"%ld\"\n" "IFIELD CONSTANT, \";\", \"%s\"\n" ; -static char tabsep[] = +static char tabsep[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: Dumps all fields in a traditional Unix tab separated style\n" @@ -1275,7 +1275,7 @@ static char tabsep[] = "IFIELD GEOCACHE_HINT, \"\", \"%s\"\n" "IFIELD GEOCACHE_LAST_FOUND, \"\", \"%d\"\n" ; -static char tomtom_asc[] = +static char tomtom_asc[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: TomTom Navigator Places of Interest\n" @@ -1304,7 +1304,7 @@ static char tomtom_asc[] = "IFIELD LAT_DECIMAL, \"\", \"%.6f\"\n" "IFIELD SHORTNAME, \"\", \"\"%s\"\"\n" ; -static char tomtom_itn[] = +static char tomtom_itn[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: TomTom Navigator Itineraries (Routes)\n" @@ -1329,7 +1329,7 @@ static char tomtom_itn[] = "IFIELD SHORTNAME, \"\", \"%s\"\n" "IFIELD CONSTANT, \"0\", \"%s\"\n" ; -static char tomtom_itn_places[] = +static char tomtom_itn_places[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: TomTom Navigator Itineraries (Routes)\n" @@ -1354,7 +1354,7 @@ static char tomtom_itn_places[] = "IFIELD SHORTNAME, \"\", \"%s\"\n" "IFIELD CONSTANT, \"2\", \"%s\"\n" ; -static char xmap[] = +static char xmap[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: DeLorme Xmap Conduit\n" @@ -1388,7 +1388,7 @@ static char xmap[] = "OFIELD LON_DECIMAL, \"\", \"%08.5f\"\n" "OFIELD DESCRIPTION, \"\", \"%s\"\n" ; -static char xmap2006[] = +static char xmap2006[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: DeLorme Xmap/Street Atlas Handheld 2006 Conduit\n" @@ -1427,7 +1427,7 @@ static char xmap2006[] = ; -static char xmapwpt[] = +static char xmapwpt[] = "# gpsbabel XCSV style file\n" "#\n" "# Format: DeLorme Xmap HH Street Atlas USA .WPT (PocketPC)\n" diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc index c52377338..91fa64564 100644 --- a/gpsbabel/kml.cc +++ b/gpsbabel/kml.cc @@ -877,7 +877,7 @@ static void kml_output_description(const waypoint* pt) if (pt->GetCreationTime().isValid()) { QString time_string = pt->CreationTimeXML(); if(!time_string.isEmpty()) { - kml_td(hwriter, QString("Time: %1 ").arg(time_string)); + kml_td(hwriter, QString("Time: %1 ").arg(time_string)); } } @@ -1630,10 +1630,10 @@ static void kml_track_tlr(const route_head* header) // Helper to write gx:SimpleList, iterating over a route queue and writing out. typedef enum { - fld_cadence, - fld_depth, - fld_heartrate, - fld_temperature, + fld_cadence, + fld_depth, + fld_heartrate, + fld_temperature, fld_power } wp_field; @@ -1650,19 +1650,19 @@ static void kml_mt_simple_array(const route_head* header, waypoint* wpt = (waypoint *) elem; switch (member) { - case fld_power: + case fld_power: writer->writeTextElement("gx:value", QString::number(wpt->power, 'f', 1)); break; - case fld_cadence: + case fld_cadence: writer->writeTextElement("gx:value", QString::number(wpt->cadence)); break; - case fld_depth: + case fld_depth: writer->writeTextElement("gx:value", QString::number(wpt->depth, 'f', 1)); break; - case fld_heartrate: + case fld_heartrate: writer->writeTextElement("gx:value", QString::number(wpt->heartrate)); break; - case fld_temperature: + case fld_temperature: writer->writeTextElement("gx:value", QString::number(wpt->temperature, 'f', 1)); break; default: diff --git a/gpsbabel/maggeo.cc b/gpsbabel/maggeo.cc index d4623acd3..65ccdfbcd 100644 --- a/gpsbabel/maggeo.cc +++ b/gpsbabel/maggeo.cc @@ -271,7 +271,7 @@ maggeo_waypt_pr(const waypoint* waypointp) } QString placeddate = maggeo_fmtdate(waypointp->creation_time); QString lfounddate = maggeo_fmtdate(waypointp->gc_data->last_found); - cname = mkshort(desc_handle, + cname = mkshort(desc_handle, waypointp->notes ? waypointp->notes : waypointp->description); placer = waypointp->gc_data->placer; diff --git a/gpsbabel/mapsend.cc b/gpsbabel/mapsend.cc index 426bf72da..26bc5333b 100644 --- a/gpsbabel/mapsend.cc +++ b/gpsbabel/mapsend.cc @@ -317,7 +317,7 @@ mapsend_waypt_pr(const waypoint* waypointp) /* #, icon, status */ gbfputint32(++cnt, mapsend_file_out); - + QString iconp; if (!waypointp->icon_descr.isNull()) { diff --git a/gpsbabel/psitrex.cc b/gpsbabel/psitrex.cc index 5fed711a3..87bb17887 100644 --- a/gpsbabel/psitrex.cc +++ b/gpsbabel/psitrex.cc @@ -609,14 +609,14 @@ psit_track_r(gbfile *psit_file, route_head **trk) trk_num++; track_add_head(track_head); } - + thisWaypoint->SetCreationTime(dateTime); track_add_wpt(track_head, thisWaypoint); - + if (gbfeof(psit_file)) { break; } - + psit_getToken(psit_file,psit_current_token,sizeof(psit_current_token), wscomma); } else { break; diff --git a/gpsbabel/reverse_route.cc b/gpsbabel/reverse_route.cc index b98cac1b3..0addc1120 100644 --- a/gpsbabel/reverse_route.cc +++ b/gpsbabel/reverse_route.cc @@ -40,9 +40,9 @@ static void reverse_route_wpt(const waypoint* waypointp) /* Cast away const-ness */ waypoint* wpp = (waypoint *) waypointp; - + int curr_new_trkseg; - + curr_new_trkseg = waypointp->wpt_flags.new_trkseg; wpp->wpt_flags.new_trkseg = prev_new_trkseg; prev_new_trkseg = curr_new_trkseg; diff --git a/gpsbabel/shortname.cc b/gpsbabel/shortname.cc index 0ddc63761..35a3ab3c3 100644 --- a/gpsbabel/shortname.cc +++ b/gpsbabel/shortname.cc @@ -300,7 +300,7 @@ main() sn.target_length(8); sn.whitespace_ok(false); - + while (*foop) { // printf("%s %s\n", mkshort(*foop+39), *foop+39); QString s = sn.Shorten(*foop + 39); @@ -376,6 +376,6 @@ printf("%s\n", qPrintable(Shortname::DeleteLastVowel(5, "eat a orange", r))); printf("%s\n", qPrintable(Shortname::DeleteLastVowel(0, "xxx", r))); printf("%s\n", qPrintable(Shortname::DeleteLastVowel(0, "ixxx", r))); printf("%s\n", qPrintable(Shortname::DeleteLastVowel(0, "aexxx", r))); - + } #endif diff --git a/gpsbabel/tmpro.cc b/gpsbabel/tmpro.cc index a0bbf1e3b..754e4ccb2 100644 --- a/gpsbabel/tmpro.cc +++ b/gpsbabel/tmpro.cc @@ -144,7 +144,7 @@ data_read(void) holder = csv_stringtrim(s, "", 0); if (strstr(holder, "http:") != NULL) { wpt_tmp->url = holder; - } + } xfree(holder); break; default: diff --git a/gpsbabel/trackfilter.cc b/gpsbabel/trackfilter.cc index cf4f25b2d..bbc62e389 100644 --- a/gpsbabel/trackfilter.cc +++ b/gpsbabel/trackfilter.cc @@ -166,7 +166,7 @@ arglist_t trackfilter_args[] = { NULL, ARGTYPE_STRING, ARG_NOMINMAX }, { - TRACKFILTER_DISCARD_OPTION, &opt_discard, + TRACKFILTER_DISCARD_OPTION, &opt_discard, "Discard track points without timestamps during merge", NULL, ARGTYPE_BOOL, ARG_NOMINMAX }, diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc index 596bc5820..1bc16c2e8 100644 --- a/gpsbabel/util.cc +++ b/gpsbabel/util.cc @@ -861,8 +861,8 @@ mklocaltime(struct tm *t) } /* - * Historically, when we were C, this was A wrapper for time(2) that - * allowed us to "freeze" time for testing. The UNIX epoch + * Historically, when we were C, this was A wrapper for time(2) that + * allowed us to "freeze" time for testing. The UNIX epoch * (1970-1-1-00:00:00UTC) was a convenient value for that. Now in the * world of Qt, sub-second time is convenient, but regenerating all the * reference files would be tedious, so we uphold that convention. diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc index 75ee9a57d..17f958ab0 100644 --- a/gpsbabel/vecs.cc +++ b/gpsbabel/vecs.cc @@ -1292,7 +1292,7 @@ find_vec(const char *vecname, const char **opts) #if CSVFMTS_ENABLED // xcsv_setup_internal_style( NULL ); -#endif // CSVFMTS_ENABLED +#endif // CSVFMTS_ENABLED xfree(v); vec->vec->name = vec->name; /* needed for session information */ return vec->vec; diff --git a/gpsbabel/waypt.cc b/gpsbabel/waypt.cc index 85e03f6b0..6dc9c8b69 100644 --- a/gpsbabel/waypt.cc +++ b/gpsbabel/waypt.cc @@ -79,7 +79,7 @@ waypt_dupe(const waypoint *wpt) if (wpt->gc_data != &empty_gc_data) { // FIXME(robertlipe): Find out why the default copy constructor doesn't - // do a sensible thing here. This will probably be easier once the + // do a sensible thing here. This will probably be easier once the // underlying types are refcounted. tmp->gc_data = new geocache_data; tmp->gc_data->id = wpt->gc_data->id; diff --git a/gpsbabel/xmlgeneric.h b/gpsbabel/xmlgeneric.h index 0db91c61b..1107922a2 100644 --- a/gpsbabel/xmlgeneric.h +++ b/gpsbabel/xmlgeneric.h @@ -41,8 +41,8 @@ void write_xml_entity(gbfile* ofd, const QString& indent, const QString& tag, const QString& value); void write_xml_entity_begin0(gbfile* ofd, const QString& indent, const QString& tag); -void write_xml_entity_begin1(gbfile* ofd, const QString& indent, - const QString& tag, const QString& attr1, +void write_xml_entity_begin1(gbfile* ofd, const QString& indent, + const QString& tag, const QString& attr1, const QString& attrval1); void write_xml_entity_begin2(gbfile* ofd, const QString& indent, const QString& tag, const QString& attr1, const QString& attrval1, -- 2.30.2